bitkeeper revision 1.199 (3eb13d7aaFLvrWm2Gy0oHRZ0KyIWNw)

xl_block.c:
  Fix xenolinux blkdev ioctl handling. Handle multisession probing in a simple manner (always say NOT multisession :-).

diff --git a/xenolinux-2.4.21-pre4-sparse/arch/xeno/drivers/block/xl_block.c b/xenolinux-2.4.21-pre4-sparse/arch/xeno/drivers/block/xl_block.c
index 6968df42b096ef3500147711ea3e17a62648f524..d3e09eb52caf88171934c0023451726d1abd9c1a 100644 (file)
--- a/xenolinux-2.4.21-pre4-sparse/arch/xeno/drivers/block/xl_block.c
+++ b/xenolinux-2.4.21-pre4-sparse/arch/xeno/drivers/block/xl_block.c
@@ -7,6 +7,7 @@
 
 #include "xl_block.h"
 #include <linux/blk.h>
+#include <linux/cdrom.h>
 
 typedef unsigned char byte; /* from linux/ide.h */
 
@@ -223,9 +224,15 @@ int xenolinux_block_ioctl(struct inode *inode, struct file *filep,
        if (put_user(0x106, (unsigned int *) &geo->cylinders)) return -EFAULT;
        return 0;
 
+    case CDROMMULTISESSION:
+        printk("FIXME: support multisession CDs later\n");
+        memset((struct cdrom_multisession *)argument, 0, 
+               sizeof(struct cdrom_multisession));
+        return 0;
+
     default:
-        DPRINTK_IOCTL("   eh? unknown ioctl\n");
-       break;
+        printk("ioctl %08x not supported by xl_block\n", command);
+       return -ENOSYS;
     }
     
     return 0;